Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Wed, 27 Apr 2016 14:18:53 +0000 (16:18 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Wed, 27 Apr 2016 14:18:53 +0000 (16:18 +0200)

Trivial merge