Merge commits from vpj-cd and redchris http://sourceforge.net/support/tracker.php?aid=3214377 http://sourceforge.net/support/tracker.php?aid=3263111 http://sourceforge.net/support/tracker.php?aid=3214343