A small fix related to https://github.com/FasterXML/jackson-module-jaxb-annotations/issues/33
Merge branch '2.4'

Conflicts:
	pom.xml