Commit ac85335cd8a41d8cf233902a6816ef281338bb19

DRC 2015-10-09T20:03:59

Merge branch '1.4.x'