Fixes BLD-1104
Merge pull request #3962 from edx/dcs/BLD-1104

Fixes BLD-1104