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