Brings in the latest changes from indigo