Sync with git://git.complang.org/dsnp.git