Merge remote-tracking branch 'origin/logarithmic_search_grid' into lo…

…garithmic_search_grid

# Conflicts:
#	analysis/parameter_tuning.py
#	analysis/tests/parameter_tuning_test.py