Pull from XBMC mainline branch xbmc/Gotham