Merge branch 'eddiehung-vtr'
authorClifford Wolf <clifford@clifford.at>
Fri, 8 Jul 2016 09:56:53 +0000 (11:56 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 8 Jul 2016 09:56:53 +0000 (11:56 +0200)

Trivial merge