Added union for window types
Merge branch 'master' into plugins