Rollup of Gecko Media Plugin patches
Merge pull request #981 from ethanhugg/gmp_rollup

Rollup of Gecko Media Plugin patches