Merge branch 'silc.1.1.branch' of silc repo