Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 08:40:39 PDT 2014