Cleanup whitespace
Merge branch '2-2-stable'
Merge branch 'master' into beta-only