7.1.2 (Final Version for 7.1.2)

See master branch for detailed commit.