Merge back changes already in pull requests to cefsharp/CefSharp

Sorry for the wall of pink: git seems to have an issue with that particular file...