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