partial manual merge of f50bc7a to be able to integrate UIWebView without merging. temporary solution until merge is suitable.