Merge branch 'master' into 0.3.x
Release
Ignores updated