Merge remote-tracking branch 'origin/master' into flake

Also update flake.lock

Created by  Eelco Dolstra  on February 10, 2020
BQHDSG6OTHRD3WP25GX2N46ZUFRDH4E6L7URATJWXN5TKIKAPQFAC
Change contents