[fedup/f20] (6 commits) ...Merge branch 'master' into f20