Note that commit 4af8f72 was provided by Peter van Gemmeren