Merge branch 'master' into sourceforge-bug-50