BIG merge from master to re enable ogl and software backends