Merge gitlabhq:master