reapplied Adrian's change r1460455

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