Merge branch 'develop'
backmerged release 0.6.1 into develop