mentioned in commit bea2d790
Manually merged in bea2d790 (after adjusting the preprocessor submodule).
closed
