Fix unit tests
Merge branch 'master' into plugins

Conflicts:
	tests/compressor/image.cpp
Missing chunk for last merge