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