Merge branch 'master' into 2.3beta-2.5beta