Merge branch 'scopetracker-shorter-types'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 23 Mar 2017 09:23:01 +0000 (10:23 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 23 Mar 2017 09:23:01 +0000 (10:23 +0100)

Trivial merge