Merge branch 'lesderid-master'
authorAndrew Karpow <andy@ndyk.de>
Mon, 22 Jan 2018 04:01:40 +0000 (05:01 +0100)
committerAndrew Karpow <andy@ndyk.de>
Mon, 22 Jan 2018 04:01:40 +0000 (05:01 +0100)

Trivial merge