Merge commit '83d2eb4'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 26 Dec 2017 18:34:06 +0000 (19:34 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 26 Dec 2017 18:34:06 +0000 (19:34 +0100)

Trivial merge