Keeping the SubTTS repos in sync

I've merged your changes into my branch, now you might want to merge my changes…