Applied Dave's GRS-1 patch - actually this was already done in revision 1.17.