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