PR: 11842 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
PR: 7827 Submitted by: Andrey Zakhvatov andy@icc.surw.chel.su