revert to 3.2.7, deployed our own version to avoid pom complications
Merge branch '1.12'