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