Update upstream source from tag 'upstream/2.11.1'
authorTeus Benschop <teusjannette@gmail.com>
Fri, 3 Nov 2017 13:30:52 +0000 (14:30 +0100)
committerTeus Benschop <teusjannette@gmail.com>
Fri, 3 Nov 2017 13:30:52 +0000 (14:30 +0100)
Update to upstream version '2.11.1'
with Debian dir d56c0561e115b1c4ffecc5c73b9706ef6482856e


Trivial merge