fix up stopStone
Merge branch 'master' into gemtalk