WIP: diverged branch of https://github.com/Patternslib/Patterns/pull/1154#1223

thet wants to merge 7 commits intomasterPatternslib/Patterns:masterfrom

thet-improvements-2Patternslib/Patterns:thet-improvements-2Copy head branch name to clipboard