Merged mbenson commit