Added tag 0.87 for changeset 06220dbaac13