Merge branch 'master' of git://github.com/bschussek/testub10