Merge pull request #940 from xtuple/tags/R1_4_5