Merge branch 'unit_tests'
authorcoderain <coderain@sdf.org>
Wed, 18 Jul 2018 12:18:33 +0000 (14:18 +0200)
committercoderain <coderain@sdf.org>
Wed, 18 Jul 2018 12:18:33 +0000 (14:18 +0200)

Trivial merge