Merge branch 'master' into martin-t/defaults 459/head
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Aug 2017 00:57:23 +0000 (02:57 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Aug 2017 00:57:23 +0000 (02:57 +0200)

Trivial merge