Merge branch 'master' of ssh://jani@git.smart-api.io/srv/git/smartapi.git
authorjani <jani@asema.com>
Fri, 4 Jan 2019 14:48:08 +0000 (16:48 +0200)
committerjani <jani@asema.com>
Fri, 4 Jan 2019 14:48:08 +0000 (16:48 +0200)

Trivial merge