Merge branch 'master' of gburri.org:euphorik