Commit c454c595dc83028770727fdb7eac7842875465ac

DRC 2016-02-04T18:46:13

Merge branch '1.2.x' into 1.3.x