Merge commit '145a2884933f2ffdd48d6835729e58f1152d274e'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 14 Oct 2016 12:02:52 +0000 (15:02 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 14 Oct 2016 12:02:52 +0000 (15:02 +0300)
refs #6654
refs #6756


Trivial merge