Merge branch 'clean-up-justification' of https://github.com/shawntabrizi/substrate into clean-up-justification