Updated to use RC6 codes -- Including new local fork of upstream project to fix build errors