Backport of AMK's checkin 1.34 and Guido's checkin 1.35:

[Bug #441527] Fixes for preprocessor support, contributed by Tarn
    Weisner Burton
1 file changed