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