Sync to freenet:master

Sync Daem0nX:master to up-to-date freenet:master.