Merge branch 'master' of ssh://woller-gui.git.sourceforge.net/gitroot/woller-gui...