typo.
Merge branch 'develop' into connection-vs-session-cleanup