Merge pull request #1553 from xtuple/4_5_x

Merge 4_5_x into 4_6_x