Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 04:39:16 PDT 2014