Merge Akismet trunk.