Merge pull request #75 from gitlabhq/6-1-stable

6 1 stable
Merge pull request #76 from anezi/6-1-stable

Merge pull request #75 from gitlabhq/6-1-stable