Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 11:00:33 PDT 2014