[gcalctool/f15/master] (2 commits) ...Merge branch 'master' into f15

[Christopher Aillon]

Summary of changes:

  eb92526... sync with f15 (*)
  661df55... Merge branch 'master' into f15

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