Merge pull request #1619 from xtuple/master