[mock-rpmfusion-nonfree: 6/7] Merge commit '3d41eda7f87f05a219bea1e32c6e7a96fd6001ff' into el6