Upstream update with conflicts resolved to gstmpdparser.c.

Greg - I talked to Brendan @brendanlong and he suggested I create this pull request.  The only file that had conflicts was gstmpdparser.c so that's the only one you need to review.