Move master branch back to osh-current