Do not fail when there is no categories
Merge branch 'master' into testing