Add quit hotkey
Merge branch 'master' into feature_dbus