Added tag 8.5 for changeset 5047365bd7bd
Fix test failure when only the older version of six is available.