[edoceo]

Hard to trace because we have a code change and file renames in the same merge. I don't like that. Renames and white-space changes should be their own commits.