build system stuff
merge from master
oasis files