Merge pull request #941 from xtuple/tags/R1_4_5