use version of webkit bundled with safari if it's more  recent than the system version
Merge remote-tracking branch: upstream/master