Fix missing return in characters controller
Merge branch 'master' into production