Commit a5cacb1ec920ccef51d927ae39e7ffbc86eb2361
authorMichel Pollet <buserror@gmail.com>
Wed, 2 Aug 2017 10:11:56 +0000 (11:11 +0100)
committerMichel Pollet <buserror@gmail.com>
Wed, 2 Aug 2017 10:11:56 +0000 (11:11 +0100)

Trivial merge