Merge branch 'master' of euphorik.ch:rup into master