Merge remote-tracking branch 'upstream/master'

Conflicts:
	Source/ConfTest/vtkCreateTreeFolderTester.cls
Merge branch 'master' into ExportOnSave