13.1 upgrade

[grahamperrin]

Not upgrade-related.

Duplicate of Help with mountroot!, let’s continue there.