Merge pull request #5553 from zouhair/master