Merge branch 'dev' of github.com:SiriDB/siridb-server into dev
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 4 Jan 2019 09:18:03 +0000 (10:18 +0100)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 4 Jan 2019 09:18:03 +0000 (10:18 +0100)

Trivial merge