Merge branch 'royal'
Merge branch 'master' into royal