Second merge from Julia Longtin repository