Don't show modules not containing an t least one ntity in view pages.
Merge remote-tracking branch 'upstream/master'