Workaround broken --remove-test-targets option.
Merge branch 'develop'