Merge branch 'foo'
authorJohn Tsiombikas <nuclear@member.fsf.org>
Thu, 4 Oct 2018 14:13:33 +0000 (17:13 +0300)
committerJohn Tsiombikas <nuclear@member.fsf.org>
Thu, 4 Oct 2018 14:13:33 +0000 (17:13 +0300)

Trivial merge