Conflicts for 10.5.2 (!17337) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Ian Baum requested to merge 10-5-stable-patch-2-17232 into 10-5-stable-patch-2 Feb 23, 2018

There were conflicts cherry picking !17232 (merged)

Please resolve then assign to @ibaum or @markglenfletcher for merge