Bump Rails 4.0 test dependencies
Bump version to 2.3.1.2
Merge branch 'release/2.3.1.2' into develop

* release/2.3.1.2:
  Bump version to 2.3.1.2