Merge pull request #16 from xtuple/master

Catch up.
Merge branch 'master' into 19550
issue #19550: More fixes
Merge branch 'xtuple' into 19550
issue #19550: swat
Merge pull request #81 from jrogelstad/19550

issue #19550: fixes