Merge branch 'elinks-0.12' into elinks-0.13