Fixes backwards compatibility after intriducing scripting keywords in expresssion parser
Merge branch 'master' of github.com:viciproject/core