Merge pull request #6794 from MikePetullo/gst1-plugins-bad