[OFBIZ-5654] Applying patch from the ticket. Thanks Pierre Smits for reporting and ofbiz.us team for fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618358 13f79535-47bb-0310-9956-ffa450edef68