Merge v0.8.8 into master.

Conflicts:
	master/docs/relnotes/index.rst