Fix #1498
Merge branch 'develop' of github.com:concrete5/concrete5-5.7.0 into develop