Pushed to guix master with changes to the commit message.

Commit 1d86b05618a063378d7ffc89a9b4c33dd65a760c.