Merge pull request #1 from mozilla/master

Update
Update GMP-API for recent changes, m-i parent=8c4a1b3a2a8b.
Merge pull request #3 from cpearce/update-2014-08-11

Update 2014 08 11