Fixed Win32 error.

Was causing runtime segfaults on Win32.

Change-Id: I7be06a562d69622fd2112c34dc6a399811ad3668
Merge topic 'refactor_panels' into next

6e3c9a6 Fixed Win32 error.