Merge remote-tracking branch 'exim_github/pr/16'