96 - fixed issue.  copy/pasted exactly to make duplication more obvious (Joe)
Merge branch '96'