PIVOT-944, backport (merge) from trunk

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