Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 02:58:48 PDT 2014