Merge pull request #138 from abartlet/lorikeet-heimdal-for-upstream