Merge branch 'master' into mirceakitsune/player_cubemaps
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 23:52:41 +0000 (10:52 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 23:52:41 +0000 (10:52 +1100)

Trivial merge