Added support for --no-persist command-line option.

Leo build: 20141023133301