Merge branch 'nyov/combined_updates/effects'
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 01:35:05 +0000 (12:35 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 01:35:05 +0000 (12:35 +1100)

Trivial merge