Tagging upstream/0.8.