Merge branch 'search' of git+ssh://stigma.fnp/home/mkoziej/wl into search