Making changes for feature-a.
Added fixes for release 2.7.1
Merge branch 'feature-a' into release-2.7.1

Conflicts:
	readme.txt