Merge branch 'master' of sk:~/mygpo-src