Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 04:34:16 PDT 2014