Merge branch 'master' into custom-renderer
Antialiasing is now a factor
Merge branch 'custom-renderer' into space-deminer