Merge branch 'wii-usb' into temp merge branch Conflicts: Source/Core/Common/Src/Log.h Source/Core/Core/Core.vcxproj Source/Core/Core/Core.vcxproj.filters Source/VSProps/Dolphin.Win32.props Source/VSProps/Dolphin.x64.props