Merge remote-tracking branch 'origin/svn' commit 'ccc1271c9d6657fb9dcf4cf3cb115fa0c8c...
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 25 Aug 2016 09:41:01 +0000 (12:41 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 25 Aug 2016 09:41:29 +0000 (12:41 +0300)

Trivial merge