iOS compilation fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/fullscreen_fragment.glsl