Cleanup.
Bumped version number.
Merge branch 'develop'