This correspond to what happens when a kline or dline is set.
This is important because masks containing @ or # do not match themselves.
+ branches/release-2.1 -> 2.2 base + 3.0 -> branches/cxxconversion + backport some immediate 3.0 functionality for 2.2 + other stuff