Merge remote-tracking branch 'origin/2.10.x'

Conflicts:
	.gitignore
	hand-written.md
	release-notes.html
	src/main/scala/MakeReleaseNotes.scala