Merge branch 'develop'
backmerged release 0.5.2 into develop