Merge branch 'uart_timeout'
authorTom Knot <tomasknot@gmail.com>
Thu, 19 Jul 2018 14:32:19 +0000 (16:32 +0200)
committerTom Knot <tomasknot@gmail.com>
Thu, 19 Jul 2018 14:32:19 +0000 (16:32 +0200)

Trivial merge