Backport all fixes from GitLab 10.1 into master

This backports all the fixes made into the 10-1-stable into master.

Merge request reports

Loading