Added @timedwait
Merge pull request #3764 from amitmurthy/amitm/timedwait

Added @timedwait