Merge commit 'b9450ae'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 22 Nov 2016 11:05:07 +0000 (13:05 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 22 Nov 2016 11:05:07 +0000 (13:05 +0200)
refs #6812


Trivial merge