iFixed options.
Merge branch 'master' into engine in the hope that it will fix the build system.