Merge commit 'd7afa23'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 11 Nov 2016 10:41:05 +0000 (12:41 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 11 Nov 2016 10:41:05 +0000 (12:41 +0200)
Conflicts:
bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java

Sync git svn branch with SVN repository r33389.

refs #6726


Trivial merge