manual merge

https://github.com/iShift/twister-webkit/pull/45