Merge branch 'master' into martin-t/cleanup
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 22 Mar 2017 18:55:22 +0000 (19:55 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 22 Mar 2017 18:55:22 +0000 (19:55 +0100)

Trivial merge