Merge pull request #1667 from xtuple/4_5_x