b279668708
[ Closes PR#1334, slightly modified by me ] Submitted by: James Raynard <james@jraynard.demon.co.uk>
[ Closes PR#1334, slightly modified by me ] Submitted by: James Raynard <james@jraynard.demon.co.uk>