Merge in additions from jbuchbinder