Add latest changes from gitlab-org/gitlab@master
Add latest changes from gitlab-org/gitlab@master

mmkassem/gitlabhq,stoplightio/gitlabhq,mmkassem/gitlabhq,stoplightio/gitlabhq,mmkassem/gitlabhq,mmkassem/gitlabhq,stoplightio/gitlabhq,stoplightio/gitlabhq