Merge branch 'master' into filter
authorDaniel Schregenberger <daniel@despite.ch>
Fri, 11 May 2018 15:19:50 +0000 (17:19 +0200)
committerGitHub <noreply@github.com>
Fri, 11 May 2018 15:19:50 +0000 (17:19 +0200)

Trivial merge