Merge branch 'master' of ssh://www.simantics.org:29417/simantics/platform