Merge pull request #13 from xtuple/master

Catch up.
Merge pull request #14 from xtuple/master

Catch up.
issue #19051: Fix path error
Merge pull request #98 from jrogelstad/master

issue #19051: Fix path error.