Fix for --GDB flag (master branch, timeout 100 seconds)
Merge remote-tracking branch 'origin/tt-gdb-fix-master'