Don't bump patch version in alpha/beta/rc bumps.

Fixes #1539.
Merge remote-tracking branch 'upstream/master'