Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 19:58:47 PDT 2014