Visual and textual improvements for system maintenance mode.
Merge remote-tracking branch 'upstream/master'