Merge branch 'release/3.0.5'
Merge branch 'master' of https://github.com/joola/joola.io