Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 16 06:43:52 PDT 2014