Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 19:40:49 PDT 2014