Commit b2817f52517361caff3dbab7373abc1b791f3246

DRC 2016-03-16T07:18:30

Merge branch '1.4.x'