Merge branch 'devel' of git://uglyman.kremlin.cc/git/systembsd into devel