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