Merge branch 'Mario/legacy_gametypenames'
authorMario <zacjardine@y7mail.com>
Sun, 16 Nov 2014 12:20:35 +0000 (23:20 +1100)
committerMario <zacjardine@y7mail.com>
Sun, 16 Nov 2014 12:20:35 +0000 (23:20 +1100)

Trivial merge