Merge branch 'master' into Mario/hitsound_pitch
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 08:50:43 +0000 (19:50 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 08:50:43 +0000 (19:50 +1100)

Trivial merge