safari bug fix
Merge commit 'a004adf382ddcc910dc6a1caf12a57074a092251'