Merge branch 'master' into Revit2015

Conflicts:
	tools/Output/RevitTestFrameworkInstaller2015.exe