Merge branch 'shawntabrizi-nonzero-ed' of https://github.com/shawntabrizi/substrate into shawntabrizi-nonzero-ed