Added support for context timeouts
protect against possible concurrency bug
Merge remote-tracking branch 'samsaffron/master'
Update documentation for execution timeout feature