From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 12 Oct 2016 08:17:39 +0000 (+0300)
Subject: Merge commit 'bd5bc6e45f700e755b61bd112631796631330ecb'
X-Git-Tag: v1.25.0~70
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=28418dc0f3cc153ba631c201c900b99e45fa03d1;p=simantics%2Fplatform.git

Merge commit 'bd5bc6e45f700e755b61bd112631796631330ecb'

refs #6751 [PRIVATE-12404]
refs #6752 [PRIVATE-12401]
---

28418dc0f3cc153ba631c201c900b99e45fa03d1