Merge in @paurosello's commit