Added tag 0.8-25 for changeset b86cb06acbcf08cea48c3117107b5918e62992f8