[cinnamon-settings-daemon/f21] cherry pick upstream (includes bz 1182457)

[leigh123linux]

Summary of changes:

  60891e3... cherry pick upstream (includes bz 1182457) (*)

(*) This commit already existed in another branch; no separate mail sent