Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 10:58:51 PDT 2014