Merge pull request #2468 from 9rnsr/fix13311

Prevent definition of non-disabled default constructors in template structs