2.11.4

rework of #242 (squashed original state, one follow-up commit)
Either delete these lines for good, or update the version numbers. Probably deleting them is better.