Merge remote-tracking branch 'upstream/master'

Conflicts:
	test/test-timer.c
Merge branch 'master' of https://github.com/bmazza/libuv