Ugly code, sexy results. Close #433
Merge branch 'master' of github.com:concrete5/concrete5-5.7.0