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