This is a backport for Gotham only

Since Gotham still the goto code I suppose we need to have one for that about to be obsolete XBMC version.

Master is already ticking for Helix

And this is why we need a development and a release branch