Added trait support
Merge branch 'master' into traitfix
Merge branch 'master' into traitfix
Merge branch 'traitfix'