fix #56
Cherry-pick of issue 56 to avoid merging staging into prod and introducing unrelated changes.
To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch
Cherry-pick of issue 56 to avoid merging staging into prod and introducing unrelated changes.