Merge branch 'master' into beta

This is step 1 to make beta a clean copy of master again
Soft reset of tmp (master) to beta

This is step two to make beta a clean copy of master again
Dummy change in beta
Dummy change in beta