Commit b961f0bfce139fac81fc73b5b2f8bb2cb1f4d6be

DRC 2015-09-16T23:16:38

Merge branch '1.4.x'