Merge with git+ssh://pasky/srv/git/elinks.git