Merge branch 'Mirio/implosion'
authorMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:32:00 +0000 (13:32 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:32:00 +0000 (13:32 +1100)

Trivial merge