Merge branch 'shawntabrizi-claims-weightinfo' of https://github.com/paritytech/polkadot into shawntabrizi-claims-weightinfo