Updated version 17.05 from 'upstream/17.05'
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>
Tue, 16 May 2017 12:51:35 +0000 (14:51 +0200)
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>
Tue, 16 May 2017 12:51:35 +0000 (14:51 +0200)
with Debian dir b312c5b3fb7ca9fa049370b932f7d64c929ef0eb


Trivial merge