Nick —
Build problem due to #2053, @type on interpLike. Looking at it now, but if necessary feel free to back out that merge.


 
Just so you all know, I intend to create the branches first thing UK time tomorrow morning unless there are any objections.