Merge pull request #2812 from alarcher/sessreg111