Merge commit '31664b6'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Wed, 9 Nov 2016 22:23:08 +0000 (00:23 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Wed, 9 Nov 2016 22:23:08 +0000 (00:23 +0200)
Sync git svn branch with SVN repository r33382.

refs #6803
[PRIVATE-12714]


Trivial merge