Merge the engine branch into the main trunk. All conflicts resolved. At the same time, add VMS support for Rijndael.