Fix compilation for VS
Merge branch 'nacl-cgame/main' into nacl-cgame/librocket