Merge pull request #5552 from zouhair/master