Merge branch 'rw/make-needs-librt'