Added tag 3.1.1 for changeset afbe88b334d5