[qtav/f25] (4 commits) ...Merge branch 'master' into f25