Merge "add timeout handle"
authorGerald Kunzmann <kunzmann@docomolab-euro.com>
Thu, 30 Jun 2016 08:24:11 +0000 (08:24 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 30 Jun 2016 08:24:11 +0000 (08:24 +0000)

Trivial merge