Temp fix for kui
Merge branch 'master' of https://github.com/stokbaek/addons