Silent fail in front of ini_set to prevent warning raised when function disabled
Restore a missing translation string that was somehow deleted
Merge remote-tracking branch 'origin/master'