[tmp]
Merge branch 'master' of https://github.com/huaizong/base_util

Conflicts:
	link_op/test