1.5.15-SNAPSHOT -> 1.5.15
1.5.15 -> 1.5.16-SNAPSHOT
Merge branch 'jrobin-1.5'

Conflicts:
	pom.xml