Merge branch 'acme-nginx'
authorToke Høiland-Jørgensen <toke@toke.dk>
Wed, 19 Sep 2018 14:30:35 +0000 (16:30 +0200)
committerToke Høiland-Jørgensen <toke@toke.dk>
Wed, 19 Sep 2018 14:30:42 +0000 (16:30 +0200)
Closes #6513

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

Trivial merge