Add unit test for restoring session with spaces in path (and other special characters)
Merge remote-tracking branch: upstream/master