Merge branch 'patch-70' into 'master'
note that todos are not affected by GitLab Notification Email settings See merge request gitlab-org/gitlab-ce!29539
note that todos are not affected by GitLab Notification Email settings See merge request gitlab-org/gitlab-ce!29539