Merge remote-tracking branch 'refs/remotes/origin/radar' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Sun, 5 Jun 2016 22:06:21 +0000 (00:06 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sun, 5 Jun 2016 22:06:21 +0000 (00:06 +0200)

Trivial merge