[#1116] Don't demand things that we don't do
Merge branch '1116-branch-standards'