[master] Merge in changes from contact, dq8, and spyro.