Merged silc_1_1_branch to trunk.