Merge tag 'for-paul-2021.02.27b' of https://github.com/akiyks/perfbook