Fix recursion issue (bad magic!)
Merge branch 'master' of github.com:thrive-refugee/thrive-refugee