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