[cinnamon/f19] (2 commits) ...Merge branch 'master' into f19

[leigh123linux]

Summary of changes:

  fd89128... add compile fix for F21 (*)
  bc48132... Merge branch 'master' into f19

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