[master] Merge in Spyro wording improvements.