Ref #62. Fixed another CREATE TABLE ... TYPE
Merge branch 'master' into 21-compatibility