...
Fix #601
Merge branch '2.4'

Conflicts:
	src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java