Stop casting categories to models since they are static (bug 1079827)
Merge pull request #818 from diox/stop-casting-categories-to-models

Stop casting categories to models since they are static (bug 1079827)