Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 07:18:41 PDT 2014