add isscalar to predicates.__all__
Merge branch 'discovery-fixes'