Updated version 2.11.0 from 'upstream/2.11.0'
authorTeus Benschop <teusjannette@gmail.com>
Fri, 6 Oct 2017 10:24:45 +0000 (12:24 +0200)
committerTeus Benschop <teusjannette@gmail.com>
Fri, 6 Oct 2017 10:24:45 +0000 (12:24 +0200)
with Debian dir 69fda4885dc6eb1d9c40cc7204f6e52204fc74e2


Trivial merge