merge some mods from svn trunk, git was started with stable and missed those