Merge pull request #6793 from MikePetullo/gst1-plugins-base