[pidgin/f15] (4 commits) ...Merge branch 'master' into f15