Merge commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-mr2 * commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e': Fix issue #2249821: Unable to start passion in safe mode
Merge commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-mr2 * commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e': Fix issue #2249821: Unable to start passion in safe mode