Update from upstream, add IE11 support