Merge remote-tracking branch 'origin/master'

Signed-off-by: LAN Xingcan <lanxingcan@gmail.com>

Conflicts:
	.gitmodules
Merge remote-tracking branch 'origin/master'