From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 9 Nov 2016 22:23:08 +0000 (+0200)
Subject: Merge commit '31664b6'
X-Git-Tag: v1.25.0~55
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=bb5a3edf299cb943999c72c69dd68fb740c8a506;p=simantics%2Fplatform.git

Merge commit '31664b6'

Sync git svn branch with SVN repository r33382.

refs #6803
[PRIVATE-12714]
---

bb5a3edf299cb943999c72c69dd68fb740c8a506