Merge "Fix return in Preprocessor::cacheSetTree"