Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 16 16:21:44 PDT 2014