Merge pull request #34 from xtuple/master

catch up.
issue #18672: Update submodule
Merge pull request #437 from jrogelstad/master

issue #18672: Merge to master.