Merge branch 'topic/mm-fixes' of git://208.110.73.182/silc into silc.1.1.branch