Port 22

Apple preps fix for Safari's web-history-leaking IndexedDB privacy bug