Import latest heimdal-1-5-branch from git

Ok'ed + reviewed by elric@