Merge branch 'master' into feature/upgrade-gatein-3.7.x