Start v0.3.1 bugfix branch