Integrated the new version.

This version includes a change from christ66 in
https://github.com/stapler/stapler/pull/40

Conflicts:
	core/pom.xml