Merge commit 'origin/release/2.10/master' into fedora/2.10/master