Merge "Fix to use world color for the Fade Transition." into devel/master