[master] Merge in spyro wording fixes.