Merge with git+ssh://toidinamai@repo.or.cz/srv/git/vlock.git