Fix for issue #5431
Merge pull request #111 from gitlabhq/6-2-stable

Fix for issue #5431
Merge pull request #112 from anezi/6-2-stable

6 2 stable