I stumbled upon this today and I agree with Deepak: http://markmail.org/message/2bsurgd52crssldk
So backporting also to R13.07 (only)

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