About time for 2.0.10

Conflicts:
	changelog.md
Documented solution to #2236

Conflicts:
	changelog.md