Merge pull request #4878 from FernetMenta/xfade