Merge branch 'bleeding_edge' into HEAD

Conflicts:
	Common/CodeRefractor.RuntimeBase/CodeWriter/BasicOperations/CppMethodCodeWriter.cs
Remove merge files