master - Fix for session ids with invalid characters in them