merge from mangoszero

Changed "puny troll" to "puny $r".