Merge commit 'abf44279add64c6f22a40592895225779b8481ea' * commit 'abf44279add64c6f22a40592895225779b8481ea': Fix NPE in SearchDialog (and thereby fix bug 2045398).
Merge commit 'abf44279add64c6f22a40592895225779b8481ea' * commit 'abf44279add64c6f22a40592895225779b8481ea': Fix NPE in SearchDialog (and thereby fix bug 2045398).