Try working around NPE in pairwise similarity.
Merge remote-tracking branch 'origin/master'