Merge remote-tracking branch 'origin/master'
authorTomas Wenström <tomas.wenstrom@gmail.com>
Sun, 5 Nov 2017 19:00:52 +0000 (20:00 +0100)
committerTomas Wenström <tomas.wenstrom@gmail.com>
Sun, 5 Nov 2017 19:00:52 +0000 (20:00 +0100)

Trivial merge