Merges stex-dev into stex