Merge pull request #137 from xtuple/master

update from master