Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 00:32:41 PDT 2014