Merge branch 'master' of ssh://jani@git.smart-api.io/srv/git/smartapi.git