Merge branch 'local_mutex' of https://github.com/janbar/xbmc-pvr-addons into mainline
Merge branch 'file_control_conn' of https://github.com/janbar/xbmc-pvr-addons into mainline