vislcg 0.9.8.10063
resolved merge conflict.