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)