Merge branch 'master' into TOMEE-2968