Merge pull request #43 from chuckdumont/master

More Jenkins failurs
Merge pull request #44 from chuckdumont/master

Fix merge error
Arabic nls strings