Pushed to guix master as commit 7180dd671697e0215b140ebc0d36047b4b8375f2.

Thanks!