Commit 1a3aebd88e1bb14e67ba0e64f0b59491631b3f25

DRC 2016-03-31T10:02:44

Merge branch '1.4.x'