[master] Merge in spyro and everdale.