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