Merge branch 'python3' of git.dolda2000.com:/srv/git/r/wrw into python3