Merge from master into 4.next
[exim.git] / test / confs / 2800
2016-11-25 Heiko Schlitterman... Merge from master into 4.next