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

6 1 stable