Merge in 1.1.1 code from Curse