Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 19:01:51 PDT 2014