Merge POV-Ray-master