Resolved conflict from old commit. 

Ready for automerge.