Merge branch 'master' into glassfish-version