Master

Merged David Pleydell requested to merge master into improved_active_search

Merge request reports