new attributes system
Merge remote-tracking branch 'origin/master'
Update Triangle to new attribute system