[fedup/f19] (7 commits) ...Merge branch 'master' into f19