PIVOT-963, the merge from trunk (committed some day ago, without this issue in the message)

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