Merge branch 't42'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 26 Feb 2019 17:33:53 +0000 (18:33 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 26 Feb 2019 17:33:53 +0000 (18:33 +0100)

Trivial merge