0.13dev: merged session persistence changes from r10460 (#9705).
Note that by mistake the mergeinfo was already present on the previous intermediate changeset...
Authored by: cboos 2011-01-23
Parent: [r10478]
Child: [r10480]