Fixed something but I don't understand
Merge branch 'master' into BoardEditor