From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 10 Nov 2016 21:45:11 +0000 (+0200)
Subject: Merge commit 'c46f0ff'
X-Git-Tag: v1.25.0~54
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=c08364c64a0bb53c45c052a3e4cea8702bbd69a0;p=simantics%2Fplatform.git

Merge commit 'c46f0ff'

Sync git svn branch with SVN repository r33386.

refs #6803
[PRIVATE-12714]
---

c08364c64a0bb53c45c052a3e4cea8702bbd69a0