Merge commit '0915910'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Wed, 5 Oct 2016 21:30:01 +0000 (00:30 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Wed, 5 Oct 2016 21:30:01 +0000 (00:30 +0300)
refs #6742
refs #6741


Trivial merge