synchronization with beta branch
cleanup
Merge branch 'master' into beta