Update version to 3.1.4.
Merge branch '3.1'