Merge branch 'topic/serverlink-fixes' of git://valera-ext.nynaeve.net/silc into silc...