Making changes for feature-b.
Merge branch 'feature-b' into release-2.7

Conflicts:
	readme.txt