Merge branch 'master' into 0.2.0-release