term labels, tabs, drop area
Merge remote-tracking branch 'origin/master'