Merge branch 'develop'

Cut a new version, baby.