Commit 2111c5acda5572c85c7f8045e0a256b4abbaa2a5

DRC 2016-01-06T19:24:55

Merge branch '1.4.x'