Try not to 'crash' when rebooting.
Merge branch 'master' into debian
6.0.2-1