Merge remote-tracking branch 'spalax/paternal/libdirs'