Allow labels to be returned as 2D array, for inclusion with "all" label filter
Merge remote-tracking branch 'origin/master'