In case of empty query results, return an empty matrix.
Merge branch 'master' of github.com:/prometheus/prometheus