commit from Sam on 12/13/13