Trap tab in creator gui looks like a bear trap, instead of a little devil.
Merge remote-tracking branch 'origin/master'