PIVOT-929, the patch (updated)

git-svn-id: https://svn.apache.org/repos/asf/pivot/branches/2.0.x@1579295 13f79535-47bb-0310-9956-ffa450edef68