Merge branch 'master' of https://github.com/SINTEF-9012/ThingML
Merge remote-tracking branch 'origin/master'