merge from clearcanvas change to my master