Merge remote-tracking branch 'origin/master'

# Conflicts:
#	HISTORY.rst
#	enpt_enmapboxapp/version.py
5 jobs for master in 3 minutes and 11 seconds (queued for 3 seconds)