Merge pull request #889 from tobiasd/20190925-blockbotes