Merging -r 859:865 branches/0.2/ with trunk