Merge remote-tracking branch 'upstream/master'
Bugfixes for category pages
Bugfixes for the previous bugfixes
Merge pull request #164 from robotmay/master

Bugfixes for category pages