merge _oasis back from master