Merge pull request #2468 from 9rnsr/fix13311

Prevent definition of non-disabled default constructors in template structs
Merge pull request #2469 from 9rnsr/2.066

Cherry-picking commits from master to 2.066 branch (for the minor release 2.066.1)