Prepare for version bump
Merge pull request #1139 from untergeek/master

Prepare for version bump