Merge branch 'master' of ssh://gulden.informatik.rwth-aachen.de/data/git-repository/acgl/libraries/acgl