Fix #863
Merge branch 'master' of github.com:concrete5/concrete5-5.7.0
Merge branch 'master' of github.com:concrete5/concrete5-5.7.0
Fix #865
Merge branch 'master' of github.com:concrete5/concrete5-5.7.0