Commit 73befdb14859eb12a9ebc42163c3e2fb97b4d232

DRC 2015-08-14T11:48:05

Merge branch '1.4.x'