Removed potential PHP warning
Merge remote-tracking branch 'innomatic/develop' into feature/locale-support