Removed conflicts from @cdelahousse's pull request. Can now be merged in automatically.

@cdlahousse's merge request had conflicts. I removed them, and now can merge them in automatically.