Fixed partial merge error.
Fixed partial merge error.

Not sure why that Max was still in there...

ahmadia/AbstractRendering,JosephCottam/AbstractRendering,JosephCottam/AbstractRendering,JosephCottam/AbstractRendering,JosephCottam/AbstractRendering,ahmadia/AbstractRendering,ahmadia/AbstractRendering,ahmadia/AbstractRendering,JosephCottam/AbstractRendering,ahmadia/AbstractRendering