From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 3 Nov 2016 20:33:39 +0000 (+0200)
Subject: Merge commit '53059ca'
X-Git-Tag: v1.25.0~63
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=c125a1755cc7c4a6241c3c5bf841c3db0ff2d658

Merge commit '53059ca'

Conflicts:
	bundles/org.simantics.scl.runtime/scl/Prelude.scl

refs #6726
refs #6788
refs #6791
---

c125a1755cc7c4a6241c3c5bf841c3db0ff2d658