Pull misc into release branch

Conflicts:

	Documentation/feature-removal-schedule.txt