Apply Search/Join hotfix to develop

This PR doesn't show the searchjoin changes, as I already applied them in #663.

It shows instead some small master --> develop changes, possibly missed by @holtgrewe @weese ?