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