Merge branch 'develop'
backmerged release 0.3.0 into develop