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