Merge pull request #1 from xtuple/master

update
Merge remote-tracking branch 'QTCLIENT/master'
Merge remote-tracking branch 'QTCLIENT/master'
Merge remote-tracking branch 'QTCLIENT/master'