Merge pull request #3151 from sartura/bump-libuv