Fixes: #3#5

jfbu wants to merge 10 commits intotabu-issues-for-future-maintainer:maintabu-issues-for-future-maintainer/tabu:mainfrom

jfbu:jfbu_Verbatimjfbu/tabu:jfbu_VerbatimCopy head branch name to clipboard