Merge pull request #6784 from remitamine/aljazeera