Merge pull request #2764 from alarcher/gupc