Fencer

Merge when 5.2 is ready to merge into master.