Disco

These commits have been used in the Disco project for a while.