From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 5 Oct 2016 21:30:01 +0000 (+0300)
Subject: Merge commit '0915910'
X-Git-Tag: v1.25.0~75
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=901596bae43d738281c8f02b4b27348c1964be51;p=simantics%2Fplatform.git

Merge commit '0915910'

refs #6742
refs #6741
---

901596bae43d738281c8f02b4b27348c1964be51