Fix some variables in the EntryQueryFilter
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Check for a template first and parse that before checking for methods / auto presenting
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Merge branch 'refs/heads/3.0/develop' into production