Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 07:56:20 PDT 2014