Commit b4922b42e7fee72746caed5a63f67ab9615f9e24

DRC 2015-09-08T19:02:18

Merge branch '1.4.x'