[geard/f20: 3/3] Merge branch 'master' into f20