[nemo/f17] (2 commits) ...Merge branch 'master' into f17

[leigh123linux]

Summary of changes:

  8eec786... update to 1.0.5 release (*)
  1cff0ff... Merge branch 'master' into f17

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