Merge branch 'master' into '62-allow-running-one-off-for-debugging-purposes'

# Conflicts:
#   stapled/__main__.py
#   stapled/core/exceptions.py
7 jobs for 62-allow-running-one-off-for-debugging-purposes in 7 minutes and 54 seconds (queued for 3 seconds)