FITIn: fixes potential crash
Merge branch 'master' into lua