Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 10:39:55 PDT 2014