Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 11:15:49 PDT 2014