Merge branch 'master' into 'i427-requirejs'