Merge souce-cleanup branch into trunk

No match.