Merge branch 'trap-fixes'