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