Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 06:53:41 PDT 2014