Merge branch 'shawntabrizi-update-transfer' of https://github.com/shawntabrizi/substrate into shawntabrizi-update-transfer