Commit e5091f2cf3b6ba747907012146df93df0d01ec85

DRC 2016-05-28T18:19:45

Merge branch '1.4.x'