v3.1.0
Merge pull request #124 from client9/remotes/trunk

v3.1.0