Merge branch 'master' into feature-redirect-injection
bb14efe
Make sure deserialization is backwards-comaptible by not deserializing redirect polyfill resources