Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 19:53:44 PDT 2014