Merge branch 'master' of ssh://lausser,shinken@shinken.git.sourceforge.net/gitroot...