Commit 2d56acb84083ba17cc26db2eb9c2616db0feb9bc

DRC 2016-02-04T18:47:07

Merge branch '1.3.x' into 1.4.x