[gstreamer-plugins-ugly/el7] squashed merge from master to el7