Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 12:31:43 PDT 2014