Merge pull request #175.
authorStefan Junker <mail@stefanjunker.de>
Thu, 19 May 2016 10:07:30 +0000 (12:07 +0200)
committerStefan Junker <mail@stefanjunker.de>
Thu, 19 May 2016 10:08:41 +0000 (12:08 +0200)

Trivial merge