Signed-off-by: Chen Xiaoliang <cxl@mail.ioa.ac.cn>
Merge branch 'origin/master'

Conflicts:
	.gitignore

Signed-off-by: Chen Xiaoliang <cxl@mail.ioa.ac.cn>