Clone
Sean Nash
committed
on 25 Apr
Fixed merge conflicts.