bugfix generics
improve Bonscript validator
got it!
Merge remote-tracking branch 'refs/remotes/upstream/master'