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