[cinnamon-control-center/f20] (2 commits) ...Merge branch 'master' into f20

[leigh123linux]

Summary of changes:

  b03e0f6... update to 2.4.1 (*)
  45bc2b5... Merge branch 'master' into f20

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