Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 16 18:08:45 PDT 2014