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