Merge pull request #1904 from xtuple/4_7_x