correction to the previous commit

please --squash this or the previous ones.
(and i'll try not to write up commits using the web interface, even for
simple things in the future)
Merge pull request #647 from AartBluestoke/upstreamMaster

correction to the previous commit