Merge pull request #1609 from xtuple/4_5_x