Added tag 0.18 for changeset f25312c39c27