Some packaging cleanup and version bump
Merge remote-tracking branch 'origin/master'