Merge branch 'master' into close-jarfile