[pull] master from gitlabhq:master#385

pull[bot] merged 2 commits intobins-dev:masterbins-dev/gitlab:masterfrom

gitlabhq:mastergitlabhq/gitlabhq:masterCopy head branch name to clipboard