Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 15:05:25 PDT 2014