Merge branch 'master' into martin-t/defaults
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 25 Jul 2017 23:49:38 +0000 (01:49 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 25 Jul 2017 23:49:38 +0000 (01:49 +0200)

Trivial merge