Merge pull request #35 from xtuple/master

Catch up.
issue #20254: Tweaks.
Translation tweaks
Merge branch 'xtuple'
resolve conflict
issue #20254: Make debug available and workable at all times.
Swat.
Merge pull request #414 from jrogelstad/20254

issue #20254: tweaks.