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)
commitc08364c64a0bb53c45c052a3e4cea8702bbd69a0
tree3390df12aeee12a2685c9adf19d31210eef04c7b
parentbb5a3edf299cb943999c72c69dd68fb740c8a506
parentc46f0ff4dd8a3adc57658770827a105209f428a0
Merge commit 'c46f0ff'

Sync git svn branch with SVN repository r33386.

refs #6803
[PRIVATE-12714]