fix for WebKit-based browsers
Merge branch 'master' into dev