Fixed(?) .ser conflicts
Fixed edit order problems
Merge branch 'darren'