abcde
update test
Merge branch '2.26' of https://github.com/nakair/doc into 2.26

Conflicts:
	b.txt
update comment