Add simple untested support for fabi and smittys builds
Remove settings option
Increase version number
Merge remote-tracking branch 'upstream/master' into nightlies