1.3.x for master

Authored by aacid on Jul 17 2017, 6:38 PM.