[smokekde/f16] (2 commits) ...Merge branch 'master' into f16