SVN-Revision: 27996
Based on a patch by Roman Yeryomin <roman@advem.lv> SVN-Revision: 27990
SVN-Revision: 27813