trying to make clean-by-name work
Merge branch '5-trunk' of github.com:webdetails/cdf into 5-trunk