Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
modified pick-match to no avail
bug fixed
Merge branch 'bugfix-pick-match'
Merge branch 'master' into develop

Conflicts:
	src/pre-filter.cpp

Used master implementation.