Pushed to guix master as commits 866e2b121c297bafb801652b4ec856b4515a3559..703005e88e19b07d5a55e4dfd36b01e00e66fc1f.

Thanks!