Bump version numbers.
Merge pull request #796 from eightyeight/version-3.6

Bump version numbers