Merge pull 771

This supersedes pull #771 -- It corrects a merge conflict.