Clone
Sean Nash
committed
on 30 Jun
Fixed merge conflicts.