sync up any differences
Revert "sync up any differences"

This reverts commit 9398b39d50b59630347cbf4ed21b5729eb2110c8.
that wasn't it
Merge branch 'staging' of github.com:D-Programming-Language/dmd into staging
Merge pull request #1665 from 9rnsr/fix9514

Issue 9514 - "template instance … is not an alias"
Merge pull request #1669 from 9rnsr/fix9525

[Regression 2.062alpha] Issue 9525 - [CTFE] Cannot convert &S to const(S*) at compile time