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)
commitfc647742fe3fb0aec6770a580d2a38a9a0cc280d
tree7d356446808280f90ad8428adf2a10adb52ebcb2
parent123d06ca1c7ceb632883afc15adac9d613ecd0f6
parent80acc1f24129b17bd1099a9caef278781beeefed
Merge pull request #1350 from Madrich/master

Some fixes