bug 512: Fix a problem causing blank result pages
Merge branch 'bug-512' into testserver-stable