Changes for 2014 11 release
Changes for 2014 11 release
Merge branch 'master' into 2015_02_Release

Conflicts:
	text1.txt