Need to actually check $outdated. Derp. @coenjacobs
Hide empty categories in the product_categories shortcode Closes #4689
Set $time Closes #4718
Merge remote-tracking branch 'upstream/master' into upstream-master