re: #528 MandyManners

re: #536 reine.de.tout

Hell, Mandy - you beat me to it.