PR: www/86414 Requested by: Robert Walters <info at panthertech dot de> Submitted by: Daniel Gerzo <danger at rulez dot sk> Took out a little part of the diff generated by Daniel.