Added tag 0.5-17 for changeset 6689006ace26956523c1cd9f84a701a69bbf7cc2