Integrated a fix Jesse made in stapler. (cherry picked from commit bd751ff8) Conflicts: changelog.html core/pom.xml