Merge remote-tracking branch 'origin/feature/8288_lineviewer_crash'
Merge branch 'master' into feature/8221_schema_version refs #8221

Conflicts:
	Code/Mantid/instrument/BASIS_Definition.xml
	Code/Mantid/instrument/BASIS_Definition_0-20130719.xml
	Code/Mantid/instrument/NOMAD_Definition.xml
	Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml
	Code/Mantid/instrument/VISION_Definition.xml
	Code/Mantid/instrument/VISION_Definition_0-20131021.xml
	Code/Mantid/instrument/VISION_Definition_20131021-.xml
Merge branch 'feature/8221_schema_version' into develop