Fix scaling of custom markers

See also #3441.
Merge remote-tracking branch 'pipping/master'

Conflicts:
	examples/api/scatter_piecharts.py

White space induced conflicts