Merge branch 'master' into 0.3.0
Merge branch '0.3.0' into integration-testing