Merge branch 'experimental-buffers' of git+ssh://repo.or.cz/srv/git/conkeror into...