From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sun, 18 Dec 2016 23:23:46 +0000 (+0200)
Subject: Merge branch 'master' into release/1.25.0
X-Git-Tag: v1.25.0~1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=60d09ba5052a280b7b603dec5661d854a498b4df;p=simantics%2Fplatform.git

Merge branch 'master' into release/1.25.0
---

60d09ba5052a280b7b603dec5661d854a498b4df