Merge branch 'master' into feature/implement_operators

# Conflicts:
#	geoarray/baseclasses.py
3 jobs for feature/implement_operators in 1 minute and 34 seconds (queued for 8 minutes and 44 seconds)
latest