mikeconley Merging in Demelo's changes from GSoC