UPSCompiler.pas:
160 with 177->178 applied

Other:
160

(To get this first get 160 and then do (untested): svn merge -r178:177 UPSCompiler.pas UPSCompiler.pas)