Merge remote-tracking branch 'origin/release/2.13/master' into fedora/2.13/master