Better reboot

Merged Chris Hines requested to merge better_reboot into master

Merge request reports