Merge pull request #4 from mikerodonnell89/20395

20395
Merge pull request #2 from xtuple/master

20395