Commit 4016731b1c missed a file. Reported-by: mniip (Freenode) [ci skip]
4016731b1c
+ branches/release-2.1 -> 2.2 base + 3.0 -> branches/cxxconversion + backport some immediate 3.0 functionality for 2.2 + other stuff