Merge changes from SharpDevelop to NRefactory