This works: https://github.com/Montellese/xbmc/compare/master...settings_deadlock
But it's not really nice :-/