Merge pull request #3012 from thess/gst1-1.8