Merge branch 'master' into 7.x-1.x