Merge branch 't42'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 25 Feb 2019 12:43:19 +0000 (13:43 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 25 Feb 2019 12:43:19 +0000 (13:43 +0100)

Trivial merge