Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 08:32:54 PDT 2014