Merge "Error compiling waitforvsync.cpp"