[clementine/f14/master] (2 commits) ...Merge branch 'master' into f14