Merge branch 'beta'
Revert 758b0a7..d22ad24

This rolls back to commit 758b0a70c57792ee6b5a853ac80fd7c6f8cb09a9.
Revert d22ad24..1063674

This rolls back to commit d22ad247460fa0a4b1254c28bc229ca4708f7f51.
test
Clean
Merge branch 'master' into beta