Fix for XBMC notification
Merge branch 'develop'