deal with empty results again, refs #6509
Merge branch 'dev' into test