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