I see dead people... not anymore
Merged graphics_invisibledead into master
Fixed merge conflicts