Merge branch 'vanilla-libeio'