Merge branch 'develop'
Merge branch 'develop'
VERSION updated
Bump VERSION to 0.5.1.dev