Commit 45c1e3a88782b069b446307ee8852f547a83e3af

DRC 2016-02-25T17:15:21

Merge branch '1.4.x'