Merge branch 'ose' of github.com:Team-OSE/vendor_ose into ose