Michael Feinstein exclusive 1_credit Gilles Toucas pr #31

Michael Feinstein exclusive 1_credit Gilles Toucas pr #31