Convert Sparkle to ARC, take three.
Merge branch 'master' into ARC
Merge branch 'master' into ARC