Merge pull request #1581 from xtuple/4_5_x