Merge pull request #577 from akrolsmir/develop
authorJarl Gullberg <Jarl.Gullberg@gmail.com>
Wed, 19 Jul 2017 17:50:31 +0000 (19:50 +0200)
committerGitHub <noreply@github.com>
Wed, 19 Jul 2017 17:50:31 +0000 (19:50 +0200)
Fix broken Android and iOS builds


Trivial merge