[master] Pull in spyro typo fixes and new text.