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