Merge branch 'master'

diff --cc mcs/class/corlib/System.Diagnostics.Tracing/EventSource.cs
Simple merge

diff --cc mcs/class/corlib/corlib.dll.sources
index 986028f677f598e7739d6d6d092ed5e49a8177ad,3cd521b6442f58a33681cd8f7597721d65a0d1ca..4d4fc1260a35fd80bb30dbe281bbe14538f33b6b
--- 1/mcs/class/corlib/corlib.dll.sources
--- 2/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@@ -164,16 -162,10 +162,12 @@@ System.Diagnostics/StackFrame.c
  System.Diagnostics/StackTrace.cs
  System.Diagnostics.Tracing/EventAttribute.cs
  System.Diagnostics.Tracing/EventCommand.cs
- ../../../external/referencesource/mscorlib/system/diagnostics/eventing/winmeta.cs
- ../../../external/referencesource/mscorlib/system/diagnostics/eventing/eventactivityoptions.cs
- ../../../external/referencesource/mscorlib/system/diagnostics/eventing/TraceLogging/EventSourceOptions.cs
- ../../../external/referencesource/mscorlib/system/diagnostics/eventing/TraceLogging/TraceLoggingEventTraits.cs
- System.Diagnostics.Tracing/EventSourceSettings.cs
  System.Diagnostics.Tracing/EventSource.cs
  System.Diagnostics.Tracing/EventSourceAttribute.cs
+ System.Diagnostics.Tracing/EventSourceSettings.cs
  System.Diagnostics.Tracing/EventCommandEventArgs.cs
 +System.Diagnostics.Tracing/EventListener.cs
 +System.Diagnostics.Tracing/EventWrittenEventArgs.cs
  System.Diagnostics.Tracing/NonEventAttribute.cs
  System.Diagnostics.SymbolStore/ISymbolBinder.cs
  System.Diagnostics.SymbolStore/ISymbolBinder1.cs