Merge branch 'master' into hotplug

diff --cc src/common/pa_front.c
Simple merge

diff --cc src/hostapi/wasapi/pa_win_wasapi.c
index d764324a703cbfa142f8bd17d1290db8dc8c6851,e865c7bf6366d4330f294bb7a09c5a01495000ab..81ec25a469f2aeb763214d0367f3f2f622529667
--- 1/src/hostapi/wasapi/pa_win_wasapi.c
--- 2/src/hostapi/wasapi/pa_win_wasapi.c
+++ b/src/hostapi/wasapi/pa_win_wasapi.c
@@@ -1312,9 -1562,8 +1562,8 @@@ PaError PaWasapi_Initialize( PaUtilHost
  
          for (i = 0; i < paWasapi->deviceCount; ++i)
                {
-                       DWORD state                               = 0;
              PaDeviceInfo *deviceInfo  = &deviceInfoArray[i];
 -            deviceInfo->structVersion = 2;
 +            deviceInfo->structVersion = 3;
              deviceInfo->hostApi       = hostApiIndex;
  
                        PA_DEBUG(("WASAPI: device idx: %02d\n", i));