Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 11:09:39 PDT 2014