Merge commit 'c46f0ff'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 10 Nov 2016 21:45:11 +0000 (23:45 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 10 Nov 2016 21:45:11 +0000 (23:45 +0200)
Sync git svn branch with SVN repository r33386.

refs #6803
[PRIVATE-12714]


Trivial merge