Merge branch 'webkit2'.
authorDaniel Carl <danielcarl@gmx.de>
Fri, 26 May 2017 22:11:00 +0000 (00:11 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Fri, 26 May 2017 22:16:12 +0000 (00:16 +0200)

Trivial merge