Merge branch 'master' of dgpo:~armin/mygpo-src