Merge branch 'shift'
Merge branch 'master' into shift