Merge remote-tracking branch 'origin/master' into 111

Conflicts:
	readme.txt