Merge pull request #8827 from remitamine/safari