[geard/f19] (5 commits) ...Merge branch 'master' into f19