Merge branch 'Mario/despawn_effects'
authorMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 08:37:29 +0000 (19:37 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 08:37:29 +0000 (19:37 +1100)

Trivial merge