AML: Fix commit 92fd3f54c7b6bca9e82d5fc15bb1ee43e39425fe
Merge remote-tracking branch 'coretech/xbmc-12.2++' into xbmc-12.2++