Minor fixes and improvements
Creation of a new merge request due to broken !18 (closed) - Related issues: https://gitlab.com/gitlab-com/support-forum/issues/2856 and https://gitlab.com/gitlab-org/gitlab-ce/issues/41492
Edited by Emeric Verschuur
Creation of a new merge request due to broken !18 (closed) - Related issues: https://gitlab.com/gitlab-com/support-forum/issues/2856 and https://gitlab.com/gitlab-org/gitlab-ce/issues/41492