Updated for XBMC 13.2 Gotham