Merge branch 'martin-t/okc' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:57:50 +0000 (18:57 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:57:50 +0000 (18:57 +0200)

Trivial merge