Merged silc_1_0_branch to trunk.