Merge branch 'master' into flexible-grouping

Conflicts:
	main/external/debugger-libs
	main/external/monomac
	main/external/nrefactory
	main/external/xwt
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisRunner.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueProvider.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj