Merge pull request #5852 from phomes/trivial
authorMartin Pitt <martinpitt@users.noreply.github.com>
Sat, 29 Apr 2017 11:39:47 +0000 (13:39 +0200)
committerGitHub <noreply@github.com>
Sat, 29 Apr 2017 11:39:47 +0000 (13:39 +0200)
Trivial cleanups


Trivial merge