* Merge Substrate master before checking Polkadot companion * Also merge polkadot/master into the companion pr branch * Set email and user name