Bump version to 3.6.1.
Merge pull request #817 from eightyeight/version-3.6.1

Bump version to 3.6.1