Merge commit '3b5069d' into develop
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 30 Sep 2016 13:31:32 +0000 (16:31 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 30 Sep 2016 13:31:32 +0000 (16:31 +0300)
refs #6726


Trivial merge