Fixes #5186
Merge branch 'master' of https://github.com/ZomgPonies/Paradise