Merge branch 'escape-cancels-dialog' into 'main'

# Conflicts:
#   apostrophe/main_window.py
1 job for escape-cancels-dialog in 22 minutes and 26 seconds (queued for 1 second)