Commit ce4ff407ff49c9be1c5775f62966766cc6b6213e

DRC 2015-08-13T18:09:20

Merge branch '1.4.x'