Merge from gitlabhq:master