[PRQ#37325] Merge Request for electricsheep-svn Accepted