Merge remote-tracking branch 'origin/master'

# Conflicts:
#	HISTORY.rst
#	enpt_enmapboxapp/version.py
4 jobs for v0.6.3 in 2 minutes and 43 seconds (queued for 3 minutes and 11 seconds)
latest