Merge commit 'pasky.or.cz/elinks-0.12' into elinks-0.13