Apply the timeout to more kinds of actions
Merge pull request #83 from xebia/strictTimeout

Apply the timeout to more kinds of actions