Stuff
Merge remote-tracking branch 'origin/master' into combotext
memory fix
oki
memory fix
fixed stuff