Added tag 0.6.17 for changeset fca68b264327d66a0954970d579ae5108923e6e7