Merge pull request #14 from jordandukart/7.x

Make sure our context gets set.
Update METRO's form id that got lost in a revert.