Based on a patch by: Sergiy <piratfm@gmail.com> SVN-Revision: 27812
SVN-Revision: 27808
SVN-Revision: 27393