Added tag 1.8 for changeset 2ea308ed1f1a