Merge branch 'master' into enhancement/improve_test_cov

# Conflicts:
#	HISTORY.rst
#	tests/test_geoarray.py
3 jobs for enhancement/improve_test_cov in 1 minute and 44 seconds (queued for 13 minutes and 12 seconds)
Status Job ID Name Coverage
  Test
passed #60965
test_geoarray

00:00:43

78.0%
passed #60966
test_styles

00:00:24

passed #60967
test_urls

00:00:36