Fixed problems with linux support.
Merge branch 'master' into scripting-support