Merge branch 'ancorcruz-master'
authorPaul Brossier <piem@piem.org>
Thu, 21 Jun 2018 00:48:08 +0000 (02:48 +0200)
committerPaul Brossier <piem@piem.org>
Thu, 21 Jun 2018 00:48:08 +0000 (02:48 +0200)

Trivial merge