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