Merge branch 'master' into upgrade-html2text