Merge remote-tracking branches 'origin/master' and 'origin/d3-wordcloud'
made clear search work again, broken by an earlier bug