Merge branch 'master' into release-0.1.1