Before_shared_ptr_fix: Merge branch 'kodi'

Made a change to the local copy after deleting this branch on github.
One small edit merged locally