Merge branch 't42'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 2 Mar 2019 07:44:15 +0000 (08:44 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 2 Mar 2019 07:44:15 +0000 (08:44 +0100)

Trivial merge