Conflicts:
	doc/source/whatsnew/v0.15.2.txt