From change made to branch by Bob Manson <manson@cygnus.com>: