Merged with updated Sparkle 1.8 edition.