SVN-Revision: 30669
SVN-Revision: 30475
Based on a patch by Sergiy <piratfm@gmail.com> SVN-Revision: 27809