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