Merge branch 'jgoodman-fix_category_table'