Added tag 1.8 for changeset d3e6fa22ae45b38b1bdb0d813390365e5930360b