Merge branch 'master' of git.ganneff.de:conkeror