uon merge master

Hi Dan,

UoN changes for Master branch. We are not on planning on moving to 2.7 for a while (we move to 2.6 in August) but I have done a quick sanity check and it seems fine.

Joe