Merge branch 'master-4.2'