Commit 55a18d40076b9a70a1c11be94d8e1a4129639bb4

DRC 2016-02-04T18:52:23

Merge branch '1.4.x'