Merge remote-tracking branch 'remotes/origin/MP1-4267-BUG-MP_Keyboard_hook_method_do_not_work_anymore_after_switch_to_net4'
MP1-4272 : Update ffmpeg.exe to latest version and remove binary from git repo (NuGet)
Fork : Extend logging.
Merge remote-tracking branch 'remotes/upstream/master' into 1.6.0Fork-BDJ
Merge remote-tracking branch 'remotes/upstream/MP1-4272-BUG-Update_ffmpeg_for_better_thumbnail_reliability' into 1.6.0Fork-BDJ

Conflicts:
	TvEngine3/TVLibrary/TVServer.Base/ffmpeg.exe
	mediaportal/MediaPortal.Base/MovieThumbnailer/ffmpeg.exe