hduregger committed caf139c Apr 17, 2011