[buildsys-build-rpmfusion/el7: 50/51] Merge branch 'master' into el7