Merge branch 'Mario/cubemaps_revert_new'
authorMario <zacjardine@y7mail.com>
Sat, 20 Dec 2014 06:18:11 +0000 (17:18 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 20 Dec 2014 06:18:11 +0000 (17:18 +1100)

Trivial merge