Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 09:16:20 PDT 2014