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