Commit b3247c7d718d18bf75cd941c3940e5562b22f5bb

DRC 2016-03-06T08:33:02

Merge branch '1.4.x'