Merge branch 'LSS-USP-unit-test-structure'
authorClifford Wolf <clifford@clifford.at>
Sun, 11 Dec 2016 10:03:25 +0000 (11:03 +0100)
committerClifford Wolf <clifford@clifford.at>
Sun, 11 Dec 2016 10:03:25 +0000 (11:03 +0100)

Trivial merge