Merge commit 'bd5bc6e45f700e755b61bd112631796631330ecb'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Wed, 12 Oct 2016 08:17:39 +0000 (11:17 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Wed, 12 Oct 2016 08:17:39 +0000 (11:17 +0300)
refs #6751 [PRIVATE-12404]
refs #6752 [PRIVATE-12401]


Trivial merge