[girl/f24] (2 commits) ...Merge branch 'master' into f24