time measurement
Merge remote-tracking branch 'origin/sdl1' into sdl1