Merge pull request #1350 from Madrich/master
authorKim Kulling <kimkulling@users.noreply.github.com>
Mon, 17 Jul 2017 09:23:29 +0000 (11:23 +0200)
committerGitHub <noreply@github.com>
Mon, 17 Jul 2017 09:23:29 +0000 (11:23 +0200)
Some fixes


Trivial merge