Merge pull request #723 from Cazra/traps

It's A Trap! v3.9

Parents: ab96e1f , 45f958a

Committed by GitHub <noreply@github.com> on 10/30/2018, 2:11:55 PM