Added tag 0.6.4 for changeset aebe66108649