Mere master
into nix-next
#1321
+18
−24
Merged
master
into nix-next
#1321