Merged with Gabe's changeset.