Merge /u/esben/gnu-efi/ branch intptr-t-fix into master