Merge branch 'master' into category-db