Merge branch 'master' into testing
WIP 0.3.2
Merge branch 'master' into testing
Merge branch 'testing' into develop