Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 10:20:12 PDT 2014