Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 15:14:04 PDT 2014