Sync with 1.47, patch by Johan Bos < dariusjb AH gmail com> and LMJ. Hail to the Foggy Team!!!!!!!!!! Not hooked up with the rest of the build system yet as it's not been re-read and proofread enough, and maybe doesn't even validate ;) pre8 or rc1 can probably wait till these issues are straighten up :)