Commit 346837cad3f5166d3d8ea8a65c9ba6eff97c59b0

DRC 2016-04-25T19:08:47

Merge branch '1.4.x'