Merge pull request #1366 from fjhenigman/clean

Canonicalize targets of clean command.