Merge branch 'martin-t/cleanup'
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 23 Mar 2017 11:48:16 +0000 (12:48 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 23 Mar 2017 11:48:16 +0000 (12:48 +0100)

Trivial merge