Cleaning up merge shenanigans. vaughncm, r-cochran, sglockner, bobthesatyr