Merge remote-tracking branch 'origin/master' into svolkov
Updated SDL to get rid of fltused error
Merge remote-tracking branch 'origin/svolkov'