Merge remote-tracking branch 'upstream/v1.2.x' into HEAD

Conflicts:
	src/_backend_agg.cpp