Merge souce-cleanup branch into trunk