Update preprocessor from master.