Merge branch 'master' into resize
authorTimo Korvola <tkorvola@iki.fi>
Sat, 10 Feb 2018 12:57:04 +0000 (14:57 +0200)
committerTimo Korvola <tkorvola@iki.fi>
Sat, 10 Feb 2018 12:57:04 +0000 (14:57 +0200)

Trivial merge