From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 20 Oct 2016 11:49:54 +0000 (+0300)
Subject: Merge commit '3efd7d44a55ae1fff284a1826e7c9afe27e0815e'
X-Git-Tag: v1.25.0~66
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=0cbe7783b5f5297ab926fa742e023cfcbdcba43d

Merge commit '3efd7d44a55ae1fff284a1826e7c9afe27e0815e'

refs #6600
refs #6774
refs #6780
---

0cbe7783b5f5297ab926fa742e023cfcbdcba43d