Work into improve merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/CodeRefractor.RuntimeBase/Optimizations/OptimizationCategories.cs