[geard/f20] (3 commits) ...Merge branch 'master' into f20