Fix PHP Error in error message generation
Merge remote-tracking branch 'origin/development' into feature-ajax