Merge pull request #26 from xtuple/master

Catch up.
issue #19314: Fix bugs
Merge pull request #227 from jrogelstad/master

issue #19314: Fix bugs.