Update spirit from master.