Commit f5cd71c5cf9404c1e1afcdc2e45712adeaddb3e9

DRC 2016-02-01T11:19:06

Merge branch '1.4.x'