From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 14 Oct 2016 12:02:52 +0000 (+0300)
Subject: Merge commit '145a2884933f2ffdd48d6835729e58f1152d274e'
X-Git-Tag: v1.25.0~69
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=e67e00d01d30f362e7a4f599cbcf24770ce13e22;hp=-c

Merge commit '145a2884933f2ffdd48d6835729e58f1152d274e'

refs #6654
refs #6756
---

e67e00d01d30f362e7a4f599cbcf24770ce13e22