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