Applied upstream: https://github.com/D-Programming-GDC/GDC/commit/96b60cbd066c856b37d9b4b5f5514d6314324a3e
Applied upstream: https:/ /github. com/D-Programmi ng-GDC/ GDC/commit/ 96b60cbd066c856 b37d9b4b5f5514d 6314324a3e