Merge pull request #1843 from xtuple/4_6_x