Merge seems to have got screwed up.  Re-pushed HEAD origin master