PIVOT-923, (final part of the patch) merge from 2.0.x

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