Fix postMessage for Safari
Merge origin/master