bump version to 3.1.1
Merge branch 'release/20130912-release' into develop

* release/20130912-release:
  bump version to 3.1.1