Merge tag '6.2' into danno
authorDaniel <thefekete@gmail.com>
Thu, 28 Feb 2019 23:29:17 +0000 (00:29 +0100)
committerDaniel <thefekete@gmail.com>
Thu, 28 Feb 2019 23:29:17 +0000 (00:29 +0100)

Trivial merge