Improve timeout result codes
Merge branch 'master' into proper_timeout_errors

Conflicts:
	lib/multi.c
Merge pull request #1 from Metaswitch/proper_timeout_errors

[Reviewer: Ellie] Proper timeout errors