From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 25 Aug 2016 06:50:46 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/svn' commit 96bb7ef9cbe42d82eb58306
X-Git-Tag: v1.25.0~157
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=8ada31c956ee02aef38627ba4deaaae3eecb623a;p=simantics%2Fplatform.git

Merge remote-tracking branch 'origin/svn' commit 96bb7ef9cbe42d82eb58306

Change-Id: I71a8c4265d3db8b6bdce94bab7e6eafd543081f9
---

8ada31c956ee02aef38627ba4deaaae3eecb623a